glnx porting: Port away from gs_file_get_basename_cached()

In some cases we use glnx_basename(), in others we already had a
`GFileInfo` around with the name.

Closes: #316
Approved by: jlebon

diff --git a/src/libostree/ostree-repo-static-delta-core.c b/src/libostree/ostree-repo-static-delta-core.c
index 013837128450ec79955ed315b4e6498e2f0c2bed..3284c2ae2280c64fb700aa2bb8a1da13ef695f1b 100644 (file)
--- a/src/libostree/ostree-repo-static-delta-core.c
+++ b/src/libostree/ostree-repo-static-delta-core.c
@@ -126,8 +126,8 @@ ostree_repo_list_static_delta_names (OstreeRepo                  *self,
               if (g_file_info_get_file_type (file_info2) != G_FILE_TYPE_DIRECTORY)
                 continue;
 
-              name1 = gs_file_get_basename_cached (child);
-              name2 = gs_file_get_basename_cached (child2);
+              name1 = g_file_info_get_name (file_info);
+              name2 = g_file_info_get_name (file_info2);
 
               {
                 g_autoptr(GFile) meta_path = g_file_get_child (child2, "superblock");

diff --git a/src/libostree/ostree-sysroot-cleanup.c b/src/libostree/ostree-sysroot-cleanup.c
index 5c37050725ecdc7bd925848343d8a07f5c106aae..64c1389e16d14a67553e94bd356c6c6d686836ce 100644 (file)
--- a/src/libostree/ostree-sysroot-cleanup.c
+++ b/src/libostree/ostree-sysroot-cleanup.c
@@ -32,7 +32,7 @@ _ostree_sysroot_list_deployment_dirs_for_os (GFile               *osdir,
                                              GError             **error)
 {
   gboolean ret = FALSE;
-  const char *osname = gs_file_get_basename_cached (osdir);
+  const char *osname = glnx_basename (gs_file_get_path_cached (osdir));
   g_autoptr(GFileEnumerator) dir_enum = NULL;
   g_autoptr(GFile) osdeploy_dir = NULL;
   GError *temp_error = NULL;
@@ -370,7 +370,7 @@ cleanup_old_deployments (OstreeSysroot       *self,
       g_autofree char *osname = NULL;
       g_autofree char *bootcsum = NULL;
 
-      if (!parse_bootdir_name (gs_file_get_basename_cached (bootdir),
+      if (!parse_bootdir_name (glnx_basename (gs_file_get_path_cached (bootdir)),
                                &osname, &bootcsum))
         g_assert_not_reached ();
 

diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c
index d1d624b6b79a3ed2709f1cdf072351ea439dacc5..0740b2e11201fe682ee5cfa632c48f69aac0c254 100644 (file)
--- a/src/libostree/ostree-sysroot-deploy.c
+++ b/src/libostree/ostree-sysroot-deploy.c
@@ -684,7 +684,7 @@ relabel_recursively (OstreeSysroot  *sysroot,
       if (file_info == NULL)
         break;
 
-      g_ptr_array_add (path_parts, (char*)gs_file_get_basename_cached (child));
+      g_ptr_array_add (path_parts, (char*)g_file_info_get_name (file_info));
 
       ftype = g_file_info_get_file_type (file_info);
       if (ftype == G_FILE_TYPE_DIRECTORY)

diff --git a/src/ostree/ot-admin-instutil-builtin-selinux-ensure-labeled.c b/src/ostree/ot-admin-instutil-builtin-selinux-ensure-labeled.c
index 1f0e91e34af8c37277352b3a97ad1f64c0cbe44a..776ab54f07041aaaa6ac2dc864783b6e2352b53e 100644 (file)
--- a/src/ostree/ot-admin-instutil-builtin-selinux-ensure-labeled.c
+++ b/src/ostree/ot-admin-instutil-builtin-selinux-ensure-labeled.c
@@ -120,7 +120,7 @@ relabel_recursively (OstreeSePolicy *sepolicy,
       if (file_info == NULL)
         break;
 
-      g_ptr_array_add (path_parts, (char*)gs_file_get_basename_cached (child));
+      g_ptr_array_add (path_parts, (char*)g_file_info_get_name (file_info));
 
       ftype = g_file_info_get_file_type (file_info);
       if (ftype == G_FILE_TYPE_DIRECTORY)